From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 31 May 2015 01:29:21 +0000 (-0400)
Subject: tree model sort: Fix compiler warnings
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~6713
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3dd7f12f783e9442ccac327f280d225b06bdb6ba;p=gtk%2B3.0.git

tree model sort: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
---

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 2a7de1e434..6cef856463 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1092,12 +1092,11 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 				    gint         *new_order,
 				    gpointer      data)
 {
-  SortElt *elt;
   SortLevel *level;
   GtkTreeIter iter;
+  GtkTreePath *path;
   gint *tmp_array;
   int i, length;
-  GtkTreePath *path;
   GSequenceIter *siter, *end_siter;
   GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
@@ -1113,6 +1112,8 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
     }
   else
     {
+      SortElt *elt;
+
       path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE);
       if (path == NULL)
 	return;